Updates the paper to the latest draft
Updates the paper, merging upstream and local
Fixes compilation issues