Fixed multiple bugs, seems to work now