Little enhancements, More support for specific situations