Updated libraries
Minor scaffold cleanup
Updated sample app