fixed bugs, and inconsistencies