Organize further, fix some bugs, but the swarms remain