Make progress on LJ, pick better names for some config props, refactor some duplicated code.