Revise paper

New folder for revised version
Fix minor errors listed in TODO