v8.4

Fixing stuff