Various small fixes and a shameless Hoodoo plug