Some more small tweaks / utility methods for this..