Above info sounds like gd advice.
Also please ( im not saying you do ) don't shout at him if he pee's on the floor, it does'nt make matters any better, in fact it makes them alot worse if you moan at them because they have did a pee or poop on the floor.
If you catch him in the act, just get his collar and lead him of to the garden and shut the door behind you, watch him untill he does a pee outside then open the door and praise him lots.
Do the same if you find pee on the floor ( say like in the morning ) ignor the mess, let him out. watch, praise ect.
My mum did that with an old staffy i bought her years ago from the dogs home, it used to pee and poop everywhere, she used to show the dog what she done and moan *WHAT HAVE YOU DONE* and then she put her out.
That approach did not help, she continued to do her bizzness every morning ect.
When she tryed the ingnoring the mess approach and putting outside like i decribed above, withing a couple of weeks or so she stopped doing her mess and was a totally clean dog, its hard to believe but its true, the ignor the mess approach really has worked for me with alot of my pups/dogs.

Obviously there aredifferent approaches in your situation ( if your dogs prob aint medical ), you will pick what you feel suits you and your dog.
Good luck and hope all goes well.