various small changes: