Fix charge balancing error and dependency housekeeping

Fix charge balancing error and dependency housekeeping #143