Updates to control and misc