* map regenerating chunk Signed-off-by: liach <liach@users.noreply.github.com> * a few more improvements Co-authored-by: liach <liach@users.noreply.github.com>