Fixed a few things asked by the sponsor