cleaned up a bit;
forced projects to version Java 1.5