incremental update
Misc changes