features and fix