Moved registration-stuff in register_defines.h
Improved minor things and fixed some little bugs