several bug fixes
billion fixes