Hardware, System: fixed nitpicks from review