The End of Fixes For Today

Last fixes I'm jamming out this AM. More work to come!