doe smell enhancements, guard and doc improvements