Slight change to mainfile
Changes to various files