Some more tweaking and customization