Pull request for more fixes!!!

Hey,

Here's the latest load of fixes ...

D