Tweaks + added doc