fix partial message problem + some broken parts