Tweaking and more for #droar