some fixes and chain update