Added Transformer and phase shifter angle. Also some bug fixes