Did some bugfixes and spam protection