Worked on a few more problems. Need to fix a couple.