Little Fixes, see commit comments

...