Incremental save and fix bug ';'