Classical Electrodynamics - enhanced