upgrade rhino
bug fixes