Reduced the number of states to 10 to avoid killing the logging system

This should fix the logging and still has useful logging data. Should go in ASAP because logs from master are unusable else.