@steven.ellsworth40 regarding the double password prompt: check if you have the /etc/default/grub file and if so, examine it for GRUB_ENABLE_CRYPTODISK=y
If that line is there, comment it out by adding a # character as the first character in the line, then run sudo update-grub
There was some discussion on the Matrix channel that suggested this may be the cause of two password prompts.