Cleaned up some excess code related to a previous bug fix. Added some commentary.
Latest libs.