fix main problems, need to go through the rest of the methods to fix everything else