It's a step in the right direction,I've been doing some work about either converting the wheels to tubleless or changing the rims as I try to get the bike on a diet.

Re the battery just got fed up the best thing since slight bread against the cost too much no advantage brigade's and found out myself.