Fix two minor issues:
- Data range had off by one error and included empty cell
- Improve handling of sheet names with non alpha numeric characters