Heavily updated. Still need to add fig1 changes from lappy