Further Improvements

Signed-off-by: Justin Yost <justin@loadsys.com>