Mainscene

merging main scene updates