correctd some code loading stuff. will revisit this later