Better comments
Switch to upload on save
Params