Classification improvements

Addresses #37