fix up errors

don't merge yet, I just want a build