updates and fixes for i686