Fixed the first of the floating point bugs
Fixed the second floating point bug where the decimal component would not be properly honoured