removed comodo and little more changes