changed java version to 1.7; some bugfixes