Please fix bugs. And some suggestions.

Discussion