various fixes
cleaned up some code
some todo's
removed node creation from entity, as it really shouldn't be there
some comments