New Features and some clean