Corrected unfinished stuff.