A bunch of work on stuff - now it pretty much works! :-)