Some small fixes and comments