Added trap generator.
Made clening.