corrected some inconsistancies