Updates

Rubocop testing, some nice changes, some not.
I've commented on the ones I think are odd, the rest seems fine