Tweaking and small additions