#ifdef'ed out. Fixed typo. Added comment to a changed that's been committed with one of the previous commits.