copying over new libs, enhancing demo app