added a few minor fixes