Bug fix and help text update