File linting, other small corrections