- add TODO reminders
- Java6 compliance
- revert combined catch to java 6 try catch