Fixxxed most bugggsss