More extras spec, a few other tweaks

From the extras file