Added self image and made approiate changes. Also made a few minor adjustments here and there.