more sprint 4 related fixes(implementation of comments)