stability and some enhancements