Fine-tuning the annotation checks... Also, doing some unit testing.
Also make sure to test the Level2 versions.