Security added + minor issue resolved