fixed some major issues.