Some more features and fixes
Some more features and fixes