more security

escaping, etc.