Added tillerino's fixes/changes to lang