merge w/ master, updating subs