A couple more tweaks :D