Bug fixes, cleanup, level 2 almost done