done a part. fixing bug.