refactored, introduced bad animation bug
fixed drawing bug