Minor fixes, Changed controller scheme