Fixed wall charge initialization.
Solved merge conflicts.