Changed answers to choices in models and migrations

Please merge to master ASAP