better abuse protection

fixes #92
fixes #90