Minor updates, spacing fixes etc