fixed some animations, did some refactoring, hopefully didn't break anything