Incremental + some plotting improvements