More Features and Fixing