Bug fixes and demo start