- move back to Java 1.6 (for compatability reasons)
- bugfixes