Added some more changes to address points on Dave's List of quick fixes.

Soon the list will be exhausted except for the admin tools that we need to work on.