Small updates

Need to also merge this into the main branch of Dan-in-Ca. It fixes some bugs and will allow Ray to make an updated per-configured SD card image. It has been way too long since the main repo has been updated.

Dan