bug850572: updates after some feedback from Callek (see bugzilla reviews)