Additional changes that improve stability and continue Adamas additions.