Made numbercompare and subtle changes