Rename, change titles/descriptions, fix minor bugs