small fixes and comments