bug fixes and demo finalization