Tuned a few details