changed some bugs and added filter for passwords