Started fixing things asked by sponsor