cleaned up, and enhanced a bit the animation - fixes #1