Lint + fix bugs