Tweaks

Finally something that works fine.