more improvements

I am checking on this so you can merge