added fixes that make this most updated version