cleaned up class() and added support for always using 1: handles