Finished problem set 6, fixed #1