fixed some faulty logic, removed and consolidated a few long runners