Few improvements, and fixes.