Small changes. Mostly to flags and the model listing in main.py