Ok. I've added in the circuit lines and reduced the number of net labels. Anything with a net label is now either voltage supply, ground, or going straight to a screw terminal. I hope this helps. I will work on testing the other things you have mentioned this weekend.
Thanks again.