Committing changes made over last week to fix bugs and allow ground state and modifiers to be used in back end code.