fix todos
move deferred action to animal
fix screen
minor memory usage fix
code cleanup
code chore
Merge branch 'master' into gh-pages
docs update