wasp

wasp added, some bugs fixed