Minor updates to style / bugfixes