Cleaning up some stuff and adding in campaign basics