Some tweaks :blush: