Cool new features

Don't need this, since I fixed tests. :)