Small updates

see commits