(wip) ~ fixed control bugs