remove system message and fix some small bugs