more consistency fixes; proper attribution