Changed some defects. Should be complete now.