Jean fixes: updates to label functionality