Updatez

Some updates, trying to bugfix, adding password, etc.