Updates

Rubocop testing, some nice changes, some not.
Yeah, it seems rubcops suggestions have limits, probably other stuff too.