Cleaning up PublicActivity
fixing and breaking many things