fixed most eslint errors