PAPER: updates
PAPER: fix some bugs