added transclusion and fixed errors