some more (int)'s removed