Almost full revision of the paper

last benchmark part still needs to be written...