Adjustments

Too busy to separate out commits.. Sorry!!