Final Update 10162014

Just final additions of code/comments