3/23/2014

Lots of improvements.