Some cleanup and add password manager