Fixed NBody and added a few small changes here and there