some updates by yuval markovich. still wip