bug fixes and animation work