fixing most issues