added things missing from previous commit