pwsafe and other additions