some small update and debug