Some more features and fixes