Various bits and pieces. Start of MJ stuff.

Signed-off-by: Sunstrike <sunstrike@azurenode.net>