small and "Nitpick"s fixes