Clean up, put in notes for SPAM, change order on security configuration