Resume update, enhancements, bug fixes