Lint changes and package fixes

There is a lot going on here, so if we want to merge this pull request there might be changes to discuss before the pull can/should be merged.