corrections to appendix A
fixed conflicts
added marker