More features and fixes