fixed minor bugs/inconsistencies