Security & Refactorings

So many things to do... this is merely a few.  ;)