Matrix-boot

Fixed a few little things. Nothing major