lots of modifications everywhere... and a useless commit message
add refs