changed to use correct division from future and fixed resulting bugs