Hello everyone. This is my first attempt ever at putting a saber together. Can someone please verify if this setup is correct?

Things to note:
- 3.7V battery
- Removable battery setup
- Act. switch LED is wired to Deep Sleep Power Indicator. Is this correct/best for removable battery setup to reduce battery drain since no kill key?
- All dots/points = connections. If no dot (especially where wires overlap each other), not a connection.
- I screwed up drawing the speaker wiring, got distracted...
IMG_20160605_223813788.jpg