Fixing layer on off problem

Bringing branches up to date.