Minor changes before merge, added comments