Use proper OR conditions when binding the model
Cleanup to fix saving files on different systems