small changes
conflict resolved
getting rid of method paper
abstract tweaks