Fixed the three most major issues