Security Options Added and minor cleanup