various (lots of) tiny updates