fixed on minor bug and added partial for message