Fixing inconsistencies

all fixed up