Bugs fixed, type now exists alongside size