more improvements

I would like to merge once travis is green. :)