comments in main file, small fixes