Clustering bugs fixed;
Fixed bug with --max-time option (not working)