Misc.

Many small fixes and additions based on feedback from Emily and Mike