Cleaned up animating of prototypes and fixed a few bugs that showed up during the fixing process.