More work on docs and fix for nil vs NSNull issue