Finishing some stuff (almost)

Closes
https://github.com/KeplerGaming/Avatar-the-legend-of-Steve/issues/47 .
Closes
https://github.com/KeplerGaming/Avatar-the-legend-of-Steve/issues/39 .