checkstyle config and some fixes