updated latex
merged from corrections and updated pdf