Some formatting fixes, label fix