Some quick edits to the CTF parser