Updated diagrams. Fixed loads of charge problems