Important corrections and fixes