Small control fixes
Extended experimental controls
xml fix