Corrected some results
-d option is useful again in *_amps