Minor updates

Copy and credit mostly, see commits