Fixed up many things