More work in progress changes
- fixed up more references and added small code to stop update cycles on asserts