Thanks everyone !! (I posted an updated version with all the fixes..thanks for pointing the river issue out again a case of staring at it for a few days and missing the obvious.. )