Fix a bajillion things