joshwhitk removed debug info, added better comments