I ended up crashing while making those edits so I'll be wrapping those later after work.