Fixed Harass and added more option