Slightly improved minor things here and there