bug fixes as i'm finding them