Update to latest versions of a few things...

 And also put a few things in line with how the om docs do them.

This is just me being OCD, I could understand if you didn't want these, but here they are just in case.