add 3.7 classes + several improvments on class definitions