whack bug fixes