Finish Level 6

- Added more intelligence
- Fixed some method names
- Fixed some bugs