fixed some major issues.
fixed some major issues.