fixed the leftovers