Some bug fixes and some demos