Tweak comments and some extra cases