Few tweaks

Seems a cool idea.