fixed a bug and tuned
* please test before commit