Fixed most issues