fixed whack stuff