last changes

including comments from main file to another