A few more updates

Here's another shot at an update from 1.2.4