dumping now also indirect via read_lehtinen_dump
some cleanup for preprocess function