Finished rest of PSET - w/ bugs