fixed all charge bugs