spacing
make incremental JSON importing more robust
remove obsolete TODO;changelog