More IC2 Machine Math, minor fixes