Fixed some bugs and changed nested mod import