Another part of new features and fixes