Fixed some problems with datablocks.
Fixed to help memory manager.