fixed some inconsistencies I think