added password capability, usability improvements