minor changes
merge done
implemented interpolation steps, still needs to be teste