Minor fixes here and there?
merging jasper's stuff and fixed-again priv_nav.launch