Manually merged minor changes from script creator