fixups, !help is still broken