Fix a few inconsistencies

Going to finish uploading tomorrow