added more classes to report + some checkstyle and unused stuff