Starting area fixes and improvements
Merge branch 'master' of github.com:l1j/en