small changes
multiple additions, mavenization ...