manually fixing items noticed by @EmmaStreet