Changes to run/build correctly in vs, Activity stuff