update with common rubocop stuff and fixes