fix label, some clean-up