last minute tweaks

A few last minute changes from @njx