added and fixed constant ints in expressions