Fixed some major issues