Added some revocation checks

Moved preprocessor stuff around