Of course, it might be nice if we change the filename to be consistent too. (Also, the following changes are really 'back-porting' from a demo version I have on local disk.)