Fixed Fidelity and added new stuff