Bullet point changes and misc fixes