fixed minor issues from last commit