hide more options (bb#560)
improve error msgs (bb#560)