cleaning up Java/new book-keeping. mac build.