additional test attempts, comments, and code cleanup