Revamping run script.
aa
Checking in 15, 16...

For the rest small changes