numerous of fixes