More updates to label code and such.