offline enhancements bug fixes