Last changes

Last changes related to comments and some small issues and improvements