few more small tweaks / updates