Fixed q_expansion and a few other things
restored to_dict
Merge remote-tracking branch 'fredrik/remove_computation' into remove_computation