Fixes!

- Fixed Crash
- Fixed Charging Issue