Fixed code bugs relating to the classification of the code.