Some minor changes; Better labels