Started with maven, small fixes