Another hint, for the battery end. Do the soldering one wire at a time then pull up the heat shrink and complete one connection before doing the second battery connection - reduces you chance of shorting across the terminals.