Many changes, some small, some not so
Ryan's changes