some guards and enhancements
some guards and enhancements