API cleanup and new UI controls.