Some modifications for STK 1.0.7
Some minor corrections from review