Multiple new features and fixes