removed passwords and added settings