most issues cleaned up