Fixed remove runs
Fixed and changed some stuff