Fix alignment
Set default values in the models
Add comma in the README
Update TODO