Small updates

see commits
:+1: