Updates and bug fixing. Adding QFE