Several issue fixes; something new broken.
Fix derivative bug