fixed most issues