fixed pdflatex error because of \textwidth
made merging branch look better