Commtting all sorts of fixes to configuration, etc.