Small improvements, additional controls