Merging changes about e_use and p_use parameters of simulation

Lot of bugfixes and finished proper implementation. Not to shabby!