last minute fixes and improvements for demo 3