Commit 21/10/2013

Enviro chooser updates