a few fixes from trying to actually compile it