Fixed #29 and animation/saving issues