Minor improvements to select box generation and model functionality.
Merge