adding more security stuff, removing obvious stuff :-)