updates and fixes.