new type and small bug fix