Sitename regex fix. Formatting and irods fixes.