Add seeds & password encryption
fix some merge conflicts, files now up-to-date