Cleaned up security definition and references a bit