Minor tweaks + made the archetype use 1.6 java