fix some major issues