Cleanup, extra tests. Now basically works.