Bug fixes, and updates to the sample folder.