various changes to make host/core/commands actually work