Custom select and some minor tweaks.

Was this just for testing? Should it now be uncommented?