some sweeping fixes
Ryan fixes