a few consistency changes
BUILDS WITHOUT ANY ERRORS!!!