Attempt at bug fixes

And some number tweaking