Some tweaks
Initial implementation of labels