Help with date (weeks and days) calculation to include first day in the sum

Good Evening,
Just when you thought it was safe to log on, I'm back!
Summary.
Please see attached workbook.
A charity hires motorbility scooters and wheelchairs. The cost is charged at weeks or part of a week.
I have set the weekly cost in the master page at £1 for ease of calculation.
If someone hires a scooter for 1 day it costs £1
If someone hires a scooter for a week (7days) it costs £1
If someone hires a scooter for 1 week & 1 day it costs £1
The current formula in columns F & G works for calculating the weeks and days, but I have just noticed that there is a problem.
If the period is weeks and days e.g. 1 week 6 days it Column 'O' calculates correctly at £2
If the period is an even number without days e,g, 2 weeks O days column 'O' doesn't calculate correctly and charges £3 instead of £2.

The 2nd part of the problem is that the calculation of weeks and days doesn't start until the day after the initial date
e.g 1/1/13 to 7/1/13 is calculated at 6 days but the hire period would include the day it was collected so it should be 7 days
When I hire a car on holiday, that's how they charge.

In case that isn't a big enough problem, I can't seem to get cell H41 to calculate the contents of column H
Thanks for looking

I've managed to sort out the small problem of why column H41 wouldn't calculate, there was something in cell H36 that it didn't like.

I've now managed to sort out the problem of not counting the first day and not adding up correctly.