Extensive work

Mistakenly forgot to add small additions and added far too much to be
specific. REVIEW.