Big fixes
Lint changes