More linting, bugfixing