Added persistent saving, fixed parse()