Added Name functionality and fixed major password storage problem