Additional changes and additions

More clean up work