some more of adam's fixes