Small changes to SWCCell.
Temporary commit, do not use.