Content additions and fixes