last set of bug fixes

Signed-off-by: Kyle Rockman <kyle.rockman@mac.com>