some fixes and info-block