Finished some thingies that I missed on the first swipe.



I think that's it.

Signed-off-by: Decius <deciusreln97@gmail.com>