Clean-up from a previous WIP; fixed a couple of the issues highlighted here-- https://www.youtube.com/watch?v=rekqSQ4R93I