features and fixes