Add parser and saving improvements
Fix example
Add improvements and updates