descripttion and control flow fixes