Minor changes
More fiddling