Update 12JUN2014

Merged Bay code, a lot of things fixed.