Remove cell references to themselves. Close #4.
Fix horizontal alignment.