Still outfitting my boat but have a few questions regarding the specifics of the requirements.

1. Fuel shutoff valves. Are these required to be mounted on the tank, or is inline along the fuel line acceptable?
2. Water containers. I have two tanks mounted, each isolated from the other with valves - is this acceptable or are we required to have "bottled" type containers.

Thanks!