Small adjustments
Small tweaks again