removes debug printing, improves options