Make level 2 easier

Fix bugs and remove features.