lint, bug fixes