Fixed build to create distributable jar file properly; other minor modifications