Update user-facing documentation, fix long option bugs