Ok, bug fixed. Should work ok now.

edit: still got issues....