Don't bother with the cosmetics, I'm already embarassed by it, will fix :-/