cleaned up API some more and impoved pom