Fixed an error and added some convenient labels