offline enhancement - bug fixes