Some additions and fixes.