updated animations, tweaked some things
mergin master
finish merge