Changed a bunch of oopsies. Should be safe to pull now.