updated latex doc with 2b
fixing merge conflicts as always...