bug fix; prepare to release