fixed controller code and added more ET calc code.
Merge branch 'master' of github.com:makilian/Mist