bug fixes, updates for demo