remove debug statements, final touch up