fixes and new question