Cleaned up some stuff and started changing controls