Updates

Tweaks and fix