WIP: change some wording, fix case