Sean's Changes + Minor Fixes