small fixes and #cave suggestions