Bug fix and new features