Minor tweaks & more orientation fixing