fixing other issues from prev commits