bugfixes and spam protection