Work on Master-Detail controllers & bugfixes