Fixes

- fix for going to next level
- cleanup