fixing a few inconsistencies