update comments and some code violation drive by fixes