one little fix and one little improvement