Improvements to framework
Update sample files
Typo