Moved stuff around to resolve any future NPE's during init
Fixed missing texture problem with flax