Comments updated and a bit of structure, deeper tests.