Add metacourse & several other fixes