Added Modulo arithmetic, in addition to apply minor stashed changes