fixed signed ints
cleanup