Security, Minor tweaks

sorry for fudging up #42