Additions, fixes.