continuous integration and some fixes.

Hopefully continuous integration is working. Fixes are alright.