Restructured marking
simplistic traces
fixed modified abp
Merge branch 'fix-bisim-prob'