2014-02-26 Tweaks

Standardizing keys and accounting for client info changes