Fixed most issues, just two outstanding