Updates

Rubocop testing, some nice changes, some not.