Various fixes and comments