Probably worth spending some time while you're at it with a pen and paper to draw how it's all laid out.
In theory, you should have nothing connected directly to the battery, with the exception of an auto bilge. I suspect though you may have something else connected directly that should be on your switch instead.
An awesome resource is some of the boat show talks from Pacific Yacht Systems:
Goes through from a very basic level how to setup your system, talks about switched vs unswitched circuits etc.