+ fix regression in selectNumber(), + little performance boost, fix whitespaces