update design + comments