Minor tweaks and additions