Minor tweaks and adding missing data