Cleaning the code... added Shiffman's Flocking code... must improve a bit