Fixed a super file
Made some more code fixes