fixes from crazybee