Minor changes, included coq support etc.