added all changes that were discussed 

I figured that using github's web interface for making actual commits would make more sense the copy-pasting the revisions under discussion.