fixed some major issues