milestone 5 & bunch of fixes/cleanup

- Changing levels.