Various small additions/fixes.