Security, Minor tweaks

sorry for fucking up #42