starting up with some small enhancements