Tidies bugs and adds a few interfaces/service definitions