Removed animation and lots of other minor tweaks.