added wrong password check + more