Final presentation fixes