a few clean-ups before beta 2