fixed null issues; fixed parse save bug