Merged in some init diffs from work computer.