Clean up paper LaTeX, begin extending for long paper version