bug fixes and demo