Small bugfixes and nerfed traits