Enumerated features and some aesthetic changes