Changing some things around, releasing v2.1.6 soon.