Some fixes + /supply barebones