restructured full paper. made lots of fixes