Cleaned the docs up a little.
Added note that TODO is fixed.
Added more name checking in line with the docs.