Select controls, containers, couple of bugfixes.