fixes for PR - especially comments in the code