Tweaks
Tweaks and fixes