fixes and demos