Security Overhaul and cosmetic changes