more tweaks and updates after testing from CLI