Fixing bugs for 2.7.1 and thinking about …

Fixing bugs for 2.7.1 and thinking about 2.8 features.