Updated readme and better label support