small tweaks from blank install
merge