small fixes and covers