Comments and refactor

Finished commenting and implemented the distractors, general cleanup.