Integrate security
Add minor cosmetic improvements