Delete mistaken links - needs review!
Many bugfixes and updates - py.test passing.