fixing rudimentary security holes