Tying some more loose ends

Signed-off-by: GreatEmerald <pastas4@gmail.com>