Fixes #28, fixes #38 and fixes #40

Oh gosh... I'm sorry for the 4 referenced this issue from a commit in logomaster256/Natura. I was squashing and I hoped it wouldn't do that for each...