Bug fix, some features.