Simplified random-point-generator, added/removed some comments