Fixed major issues