Added piece labels.
Fixed merge issues.