fix some bugs and done notifying how to do next.