some more improvements--moving towards 2.0