uncommented some things, deleted old comments/code