bug fixes (ie, i do not remember what i did