Fixed Label and Added some stuff