Incorporate flatland changes and add linting