Minor tweaks and markdown for later