Tweaks

Bugs still needed to clean