State now, pathtracking ok, incremental corrected

Various other things, see diff