fix past-work bugs