Fix up linting a bit.
Updated config definitions
Fixed up a few types.