Patch of fixes for bugs and oversights

Oh hell yes, it was always bugging me yet I forgot about it once surgery was finished.