Value labels added. Closes #24. Little bug at initial state