Added label tool; fixed some init bugs