more lscd improvements