big fixes uh-huh