The camshaft marks should meet up every half revolution. I would not just install where it was before everything should be zero'd.
This is all in the timing belt vfaq, but turn them until the dowel pins are on the top, and timing marks are lined up. At this point all the valves are closed. The main pully should read TDC as well, and if it doesn't, it is probably spinnning on you and maybe be time for a new one. Test if it is at TDC by taking out the number 1 spark plug and sticking a clean metal rod down there and it should be at the highest point when the camshaft marks like up.
I'm not sure what tensioner you are talking about? The hydraulic one? This must be taken off and redone. No marking. The bearing one? It should hold tight and probably be ok tensionwise if you are re-using the timing belt, but might as well replace it at the same time as well. Replace your timing and balance shafts belts it would be a good idea.
I haven't done a water pump replacement sorry can't help you there, but I've done the timing belt way too many times.