animate inserts, bugfix and cleanup for generator