a couple of bug fixes and demo updates