java updates
removed comments, added parameters to some rules