some features and fixes