Add Support for unbound-control and some cleanup