Fixed some bugs in the whizbaz feature.
Whoops, forgot to checkin a file.
Further development.