fixed some inconsistencies