More testing and fixes.