Several adjustments; Most linters working again.
Removing debug line.