One pass through the semantics, reformatting and fixing bugs + adding todos towards the paper