updated some classes + pom