cleanup & proper credits where due