various fixes, hangs on bundler run