more classifications and some clean up