Fixed most code, still a few blocks missing (Boom+)