Simple Fantasy: Various Fixes 2

-2nd Set of Various Fixes for today.