Added label, fixed bugs