Features and minor fixes