Bug fix, improvements.