Minor layout changes. Added a (slower) Java-Version