Autoclass first pass
Fix bugs.