Unnerfing and bugfixes