Addl bug fixes improvements
Bug fixes