Added numbercompare functions and other small changes