some linting and stupid fixes