Discussion and small additions and fixes

Moved some text/files around to clear up final.tex