fixed inconsistancies