Just edited some things and ran some tests.