Formatting, Comments, Add argument updates for bundles