Small content improvements and added a security check option