Alignment, a few comments, converting a few hard-coded values to settings