Incremental updates and a couple bug fixes