Small Optimization
Update bugfixes for % operator