typo + typedef + selection tweak + removed padding + even more