few minor changes, nothing is breaking