Filled in some holes I missed before proper emulation starts :)