huge checkin w/ fixes