Updated to 1.16

Added Kalista.  Cleaned up the code a little.