minor changes and comment
little reconfiguration of the project.