merging updated mainactivity stuff
merging