Added harass and waveclear, improved stuff