Revert "Revert "Extra fixes""

This reverts commit 2b8ef01801cefdabcd19fd0714830ddae7029657.
Revert "Revert "minor alterations""

This reverts commit 975e18b333dbb2af2846f0357d7224e9da6cabe0.