lot o' fixes