fixed minor bugaboos
seems to all work