Dev-freeze tweaks.

I'm giving up on the combitool for now. It can come back another time.