Fix saving and escaping symbols + Clean up