Add Title Parsing and clean up save