Added performance indicators
fixed bug