Expanded a bit on a couple of topics