no maven
other small fixes
Please enter the commit message for your changes. Lines starting