fix a buncha things to get it running