5:03, minor function fixes to controller