small fixes to the main file