fixes; remove debugging