Tweaking and reordering, commenting