Many internal changes and fixes.