#75 small fixs