tweaks to error handling in the main catalyst script, and added portage_confdir to...