fixed a few _crashers_