Started conversion to latex + some neatening up