fix derp.
small refactoring
smoother transition between frames
fix another derp.