Battery holder updates and side fix