And a few other fixes included.

This one is for Registered Users only - Have to keep the leeches out - Sorry!