fixed deadlock, upgraded to latest Rx, cleanup build script