Add notes and remove debugging code, test performance