wip, misc cleanups.
update travis