More cleanup of ifdef's also a little doc work.