Label update and some bug fixes