Add comments & fix some checkstyle
Resolve conflicts + checkstyle