some fixes--this will break things for a minute