resolved some redundancies, made note of code not yet active