Insects refactored for a more simple flow. Bugfixes.