Updated control scheme, streamlined some stuff