various

client-requested edits