some few minor fixes