merge atartanian and clothbot codes

fix ngons