Tweaking a few things...