Finished rest of PSET - w/ bugs

maybe works?